From 4df3c6e8a844d71b8242bbf73841a3a487490875 Mon Sep 17 00:00:00 2001 From: Welton Moura Date: Mon, 20 Jan 2025 15:32:05 -0300 Subject: [PATCH] style: paleta de cores --- gestaoRaul/balcao/templates/viewBalcao.html | 6 ++- .../comandas/templates/viewcomanda.html | 2 +- gestaoRaul/db.sqlite3 | Bin 299008 -> 299008 bytes .../home/__pycache__/views.cpython-313.pyc | Bin 3797 -> 4283 bytes gestaoRaul/home/templates/home.html | 6 +-- .../htmx_components/htmx_list_products.html | 2 +- .../htmx_list_products_balcao.html | 4 +- .../htmx_list_products_in_comanda.html | 4 +- gestaoRaul/templates/static/base.css | 14 ++++- .../static/comandas/css/viewbalcao.css | 23 +++------ .../static/comandas/css/viewcomanda.css | 29 ++++------- gestaoRaul/templates/static/home/css/home.css | 48 +++++++++++------- gestaoRaul/templates/static/home/js/home.js | 13 ++++- gestaoRaul/templates/static/pico.css | 4 +- 14 files changed, 85 insertions(+), 70 deletions(-) diff --git a/gestaoRaul/balcao/templates/viewBalcao.html b/gestaoRaul/balcao/templates/viewBalcao.html index fd41234..9f3994e 100644 --- a/gestaoRaul/balcao/templates/viewBalcao.html +++ b/gestaoRaul/balcao/templates/viewBalcao.html @@ -75,8 +75,9 @@
+ > {{product.name}}
@@ -89,8 +90,9 @@
+ > {{product.name}}
R$ {{product.price}}
diff --git a/gestaoRaul/comandas/templates/viewcomanda.html b/gestaoRaul/comandas/templates/viewcomanda.html index 55ab4d6..eef0db0 100644 --- a/gestaoRaul/comandas/templates/viewcomanda.html +++ b/gestaoRaul/comandas/templates/viewcomanda.html @@ -130,7 +130,7 @@ Detalhes {{comanda.name}}
{% for product in products %} -
+
{{product.name}}
R$ {{product.price}}
diff --git a/gestaoRaul/db.sqlite3 b/gestaoRaul/db.sqlite3 index f71d41a0ce60623098db702609f90f6a1e70c559..deb95484d7921d819420a711d30fcbc67b01a7b2 100644 GIT binary patch delta 943 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 literal 3797 zcmbUkTWlN0aqo`D_d}vYNfcvIq^vrOEb3viisIN!t%$ZsN49w&;FfZT6M3f2A@AtD zqf@&dHG+O9%}4st04f@wHku;NR~;Zg3^X4uiWdIVg+VA>r3OU|6#k>C6bRCv&K`NB z>?rADdEA?wnVp^4ot>H6^>~~J+WI>`EBzIq&&j}SmNu~a0D!j;hd3&YQWT~}2~4Ny z6oVN9W&pNeONzy;F}9?wDI2z>?AUIM*|a0+aYrd=sFb{nuQ?MZpD*MRM5ANGM< zN4h7~i+c^6Gwo0H;XVU)rTbF>957&adLT832S?HJU=(p4&O1+WzG0MTD~yNs;CuGq zgC%>c_YvWWQMwfiQc=JFF{G)6j{m$N>!E=L3f{4)v7sy2?0gr zFJI1AgvyG5^H{iA6R}VPf+edM61`O(D?+}=tAZ+4ge4$(&tth*E2s-{g_nvvVAylG zwZ8p4f4w3|szTUGSgut&GIiT20rXS_AUO=u5?>JtRNGSWA_vI8fA>?szJ*3mj$n@2Z=6ocK2-_uEbpQPXb-CGXa72$?!vWt2|&h>_474Y#@wNj3;dXFJCU*$_6 zKvHEzckY3`SBvUi+JLbhaOEq!sN}D~RT7J2jw%*}S6&i|q8xK$uc4#7az!YpitgY` zB`lQSPGAyRFwsG0_;MMOgVe2tfr@VDB?&A9E-OLXWpYdME7vjEw3t=5k^3enDjtS0 zeu{J<(v6Vr0CWnOH)=Hf_`-9`i2Zyv!X2U+T6^t~3F)bKt1dnLJBOi?eOMD}EWFtsef|)h%R^UJ*Fs=p0 z8-bV>h}8oVYtBuA`0kqXVPvWinbRV3jmQZta^l|gdgM$alF=fWt-hi4V7+f_%i~@9 zN!=4}vM9(Tjp(R(vZmX4m-u#bFUMLh#QFRlN0aw;P0cnq%e-X%an! zBnJK#__H~?$&)csnK^2`GoHuCWW=!-{cwjF$vT3v);@Ilw-8NiSthej#K_t*Jztjq zSmF;)v`JWhzqnvVE^`+~QP%PeYYjXh5{CP0@IS1@e#2Tr`>wT*2LJt9FTIP9i$pYX zA&r(J7t&~1#(v%6Ua{Jrbd9mtdf-qOjtU7YDH62$*g)Y7$91~BqOM+eSf{PyVZ zShjF3-EfRf&pkIi4bLN@7o-hKk-x6o=$oCMO-xSDz|-MK#u&Y~D3rx(P-+zOc~OyS z<+AR8C|eWq`I6cJ%j%=&i8MxcR3OCjNwLi9J_9_D1*mzTvXR?}q$u%a@djU%F|j<> zi%C+~?Pg7+J4j^&%c{K2Nb;+g+*C{sRkvOi%Mku`D_^ZbV$mH{L%1lFbkEngDAnNJXUoZ0T*ErRyC|~ zse3GO0nW5Sw;G8^(OKh-r--`Kq?>_GA;z_Gj?v@qz*u(|R$+~Wny849fRliV65e0H zk&raPvd?VwM{mvF$!TNH*8Atz99#a;TZ4B(TI6WmpZMTMjkz-)&z*U2Rhzq@`7f;5 znqK7b-CW%C_uot#-9wN6%}cLeYIq`=Cvtc3{tq@hkqytv&194AXMKMOgw_@}-Mw#~ zef{kE_^+paIdy08cj@=i+VET>nAC#Fdhqlo?lYV2!G?Q8bC29&-}T=1-VJ;hem|^@ zzR(Dt)57QK;R~O*GkbY_w|#fVKa9U0-^=r8ha3Je%|F)gAJY7X>i*apwtqFJS=P5jqzrF{ zN8#y8`3I5ml|n+|Ycq?-&>x0gj3y7GKOLKZ%kk&Ky~*z}v0=TZc!ifra$H%Jv0A99 zicyku(8ZN_MF#&-|+vwCbn%G7&pCjKt?T7*}yp0ZSqv^j=Kz diff --git a/gestaoRaul/home/templates/home.html b/gestaoRaul/home/templates/home.html index 8eacbfa..ad4948b 100644 --- a/gestaoRaul/home/templates/home.html +++ b/gestaoRaul/home/templates/home.html @@ -13,11 +13,11 @@ RRB&C - DashBoard

DashBoard

-
+
-

+

Últimos 30 dias

@@ -61,7 +61,7 @@ RRB&C - DashBoard
-

Faturamento anual

+

Faturamento mês a mês

diff --git a/gestaoRaul/templates/htmx_components/htmx_list_products.html b/gestaoRaul/templates/htmx_components/htmx_list_products.html index 453b3fa..b97a08e 100644 --- a/gestaoRaul/templates/htmx_components/htmx_list_products.html +++ b/gestaoRaul/templates/htmx_components/htmx_list_products.html @@ -4,7 +4,7 @@
diff --git a/gestaoRaul/templates/htmx_components/htmx_list_products_balcao.html b/gestaoRaul/templates/htmx_components/htmx_list_products_balcao.html index beb28e1..578b3ac 100644 --- a/gestaoRaul/templates/htmx_components/htmx_list_products_balcao.html +++ b/gestaoRaul/templates/htmx_components/htmx_list_products_balcao.html @@ -7,7 +7,7 @@
@@ -21,7 +21,7 @@
{{product.name}}
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 a24d226..fd3d69a 100644 --- a/gestaoRaul/templates/htmx_components/htmx_list_products_in_comanda.html +++ b/gestaoRaul/templates/htmx_components/htmx_list_products_in_comanda.html @@ -14,8 +14,8 @@ {% if item.product.cuisine == True %} + src="{% static 'midia/icons/note.svg' %}" + style="width: 25px; height: 35px; cursor: pointer;"> {% endif %} diff --git a/gestaoRaul/templates/static/base.css b/gestaoRaul/templates/static/base.css index fc50a31..44333e8 100644 --- a/gestaoRaul/templates/static/base.css +++ b/gestaoRaul/templates/static/base.css @@ -1,7 +1,13 @@ @import url('https://fonts.googleapis.com/css2?family=Inter:wght@200;300;400;500&display=swap'); + +:root { + --main-gradient: linear-gradient(145deg, #1E2A3B, #2C3E50); + } + + + body { margin: 70px 0px 0px 0px; - /* padding: 15px; */ } h1{ @@ -90,6 +96,7 @@ text-align: center; display: inline-block; color: #fff; cursor: pointer; + transition: display 0.9s ; } .dropdown-content { @@ -99,7 +106,6 @@ text-align: center; background-color: #313238; min-width: 160px; box-shadow: 0px 3px 10px #464646; - transition: display 0.9s ease-in-out } .dropdown-content a { @@ -107,11 +113,15 @@ text-align: center; padding: 12px 16px; text-decoration: none; display: block; + + } .dropdown-content a:hover { background-color: #7a7a7a; border-radius: 5px; + display: block; + } .img-drop { diff --git a/gestaoRaul/templates/static/comandas/css/viewbalcao.css b/gestaoRaul/templates/static/comandas/css/viewbalcao.css index c4e1f31..13a443f 100644 --- a/gestaoRaul/templates/static/comandas/css/viewbalcao.css +++ b/gestaoRaul/templates/static/comandas/css/viewbalcao.css @@ -1,3 +1,5 @@ + + .grid-container { display: grid; grid-template-columns: repeat(2, 2fr); @@ -14,24 +16,15 @@ margin: 0 auto; } -.card { - width: 120px; - height: 120px; - background-color: #c9ffbc; - border-radius: 15px; - box-shadow: 5px 5px 10px rgba(0, 0, 0, 0.2); - text-align: center; - line-height: 40px; - font-size: 20px; - font-weight: bold; - color: #333; - transition: transform 0.2s; - cursor: pointer; +.card-product { + background: var(--main-gradient); + box-shadow: 3px 3px 10px rgba(2, 2, 2, 0.678); + } -.card:hover { +.card-product:hover { transform: scale(1.05); - box-shadow: 10px 10px 20px rgba(0, 0, 0, 0.3); + box-shadow: 3px 3px 10px rgba(185, 185, 185, 0.678); } table td th { diff --git a/gestaoRaul/templates/static/comandas/css/viewcomanda.css b/gestaoRaul/templates/static/comandas/css/viewcomanda.css index 5a91843..e15decf 100644 --- a/gestaoRaul/templates/static/comandas/css/viewcomanda.css +++ b/gestaoRaul/templates/static/comandas/css/viewcomanda.css @@ -16,25 +16,16 @@ margin: 0 auto; } -.card { - width: 120px; - height: 120px; - background-color: #c9ffbc; - border-radius: 15px; - box-shadow: 5px 5px 10px rgba(0, 0, 0, 0.2); - text-align: center; - line-height: 40px; - font-size: 20px; - font-weight: bold; - color: #333; - transition: transform 0.2s; - cursor: pointer; - } - -.card:hover { - transform: scale(1.05); - box-shadow: 10px 10px 20px rgba(0, 0, 0, 0.3); - } + .card-product { + background: var(--main-gradient); + box-shadow: 3px 3px 10px rgba(2, 2, 2, 0.678); + + } + + .card-product:hover { + transform: scale(1.05); + box-shadow: 2px 2px 10px rgba(185, 185, 185, 0.678); + } table td th { text-align: center; diff --git a/gestaoRaul/templates/static/home/css/home.css b/gestaoRaul/templates/static/home/css/home.css index d90f3ce..21499c5 100644 --- a/gestaoRaul/templates/static/home/css/home.css +++ b/gestaoRaul/templates/static/home/css/home.css @@ -1,12 +1,13 @@ .grid-container { display: grid; + justify-self: center; justify-content: center; justify-items: center; align-items: center; grid-template-columns: repeat(3, 2fr); - gap: 20px; + gap: 30px; max-width: 1200px; - margin: 0 auto; + margin: 0px 0px 20px 0px; padding: 10px; } @@ -14,9 +15,11 @@ width: 420px; height: 420px; justify-items: center; - background: linear-gradient(135deg, #97cefa, #457bd1); + /* background: linear-gradient(135deg, #97cefa, #457bd1); */ + background: var(--main-gradient); border-radius: 10px; - box-shadow: 0 4px 20px rgba(0, 0, 0, 0.1); + box-shadow: 0 4px 15px rgba(0, 0, 0, 0.719); + text-align: center; line-height: 30px; font-size: 20px; @@ -27,8 +30,8 @@ } .card:hover { - transform: translateY(-5px); - box-shadow: 0 8px 30px rgba(0, 0, 0, 0.2); + transform: translateY(-10px); + box-shadow: 0 4px 8px rgba(199, 199, 199, 0.25); } .card-resumo { @@ -38,9 +41,19 @@ align-items: center; width: 300px; height: 130px; - background: linear-gradient(135deg, #1a237e, #3f51b5); + background: var(--main-gradient); border-radius: 10px; - box-shadow: 0 4px 20px rgba(156, 156, 156, 0.2); + box-shadow: 0 4px 10px rgba(12, 12, 12, 0.973); + text-align: left; + line-height: 20px; + padding: 15px 30px 15px 30px; + transition: box-shadow 0.4s; + +} + +.card-resumo:hover { + + box-shadow: 0 4px 15px rgba(175, 175, 175, 0.295); text-align: left; line-height: 20px; padding: 15px 30px 15px 30px; @@ -48,12 +61,13 @@ .card-faturamento-anual { justify-self: center; align-items: center; - width: 80%; + width: 70%; + max-width: 1350px;; max-height: 350px; margin: 30px; - background: linear-gradient(135deg, #1a237e, #3f51b5); + background: var(--main-gradient); border-radius: 10px; - box-shadow: 0 4px 20px rgba(156, 156, 156, 0.2); + box-shadow: 0 4px 15px rgba(0, 0, 0, 0.493); text-align: left; line-height: 20px; padding: 15px 30px 15px 30px; @@ -77,13 +91,9 @@ .card { width: 95%; - background: linear-gradient(135deg, #d3ebff, #a1c4fd); - text-align: center; - line-height: 30px; - font-size: 20px; - font-weight: bold; - padding: 10px; - color: #333; - transition: transform 0.2s, box-shadow 0.2s; + + } + .card-faturamento-anual { + max-width: 120%; } } diff --git a/gestaoRaul/templates/static/home/js/home.js b/gestaoRaul/templates/static/home/js/home.js index 214e47c..9572830 100644 --- a/gestaoRaul/templates/static/home/js/home.js +++ b/gestaoRaul/templates/static/home/js/home.js @@ -29,11 +29,20 @@ var chartVendas = new Chart("vendas", { y: { ticks: { display: true, + color: 'white', callback: function(value, index, values) { return chartVendas.data.labels[index].substring(0, 6); }, } }, + x: { + ticks: { + display: true, + color: 'white', + + + } + } }, legend: { display: true, @@ -116,7 +125,7 @@ var chartCuisine = new Chart("cuisine", { size: 18, weight: 'normal' }, - backgroundColor: 'rgba(8, 26, 81, 0.66)', + backgroundColor: 'rgba(1, 2, 5, 0.66)', bodyColor: 'rgba(255, 255, 255, 0.7)', bodyFont: { family: "'Poppins', 'sans-serif'", @@ -306,7 +315,7 @@ var resposta = fetch(`/chartCuisine/${dateStart}/${dateEnd}`, {method: 'GET', chartCuisine.data.labels = xValues chartCuisine.update(); - document.getElementById('30-days').innerText = '' + document.getElementById('30-days').innerText = 'Período de 30 dias' }) .catch(error => { diff --git a/gestaoRaul/templates/static/pico.css b/gestaoRaul/templates/static/pico.css index f3e8163..6c2aa21 100644 --- a/gestaoRaul/templates/static/pico.css +++ b/gestaoRaul/templates/static/pico.css @@ -309,7 +309,7 @@ details summary[role=button]:not(.outline)::after { --pico-accordion-active-summary-color: var(--pico-primary-hover); --pico-accordion-close-summary-color: var(--pico-color); --pico-accordion-open-summary-color: var(--pico-muted-color); - --pico-card-background-color: var(--pico-background-color); + --pico-card-background-color: linear-gradient(145deg, #1E2A3B, #2C3E50); --pico-card-border-color: var(--pico-muted-border-color); --pico-card-box-shadow: var(--pico-box-shadow); --pico-card-sectioning-background-color: #fbfcfc; @@ -1974,7 +1974,7 @@ article { transition: transform 0.2s; } article:hover { - transform: scale(1.02); + /* transform: scale(1.02); */ box-shadow: 10px 10px 20px rgba(0, 0, 0, 0.3); } article > header,