bronku/cake-order-tracker
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

flattening

Browse source
This commit is contained in:
bronkuu 2026-06-16 11:19:43 +02:00
parent e829562062
commit 5610b28254
3 changed files with 95 additions and 128 deletions
Download patch file Download diff file Expand all files Collapse all files

2
server/get.go
View file

@ -82,7 +82,7 @@ func (h *Server) orders(r *http.Request) (templ.Component, int, error) {
} }
if r.Header.Get("HX-Request") == "true" { if r.Header.Get("HX-Request") == "true" {
return templates.OrdersContent(orders, cakeCounts, specialCakes, firstStr, lastStr, specialFilter), http.StatusOK, nil return templates.MainContent("Panel główny", templates.OrdersContent(orders, cakeCounts, specialCakes, firstStr, lastStr, specialFilter)), http.StatusOK, nil
} }
counts, err := h.s.GetOrderCounts() counts, err := h.s.GetOrderCounts()

173
server/static/layout.css
View file

@ -1,113 +1,106 @@
body { body {
display: grid; display: grid;
grid-template-rows: var(--topnav-h) 1fr; grid-template-rows: var(--topnav-h) 1fr;
height: 100dvh; height: 100dvh;
}
.topnav { > header {
display: flex; display: flex;
align-items: center; align-items: center;
gap: var(--space-md); justify-content: end;
padding: 0 var(--space-lg); gap: var(--space-md);
border-bottom: 1px solid var(--outline-dim); padding: 0 var(--space-lg);
background: var(--surface); border-bottom: 1px solid var(--outline-dim);
z-index: 30; background: var(--surface);
} z-index: 30;
> nav {
.topnav > h1 { display: flex;
margin-right: auto; gap: var(--space-xs);
} a {
display: flex;
.topnav > nav { align-items: center;
display: flex; gap: var(--space-sm);
gap: var(--space-xs); padding: var(--space-sm) var(--space-md);
} border-radius: var(--radius-md);
font-size: 0.875rem;
.topnav > nav > a { font-weight: 500;
display: flex; color: var(--on-surface-dim);
align-items: center; text-decoration: none;
gap: var(--space-sm); &.active {
padding: var(--space-sm) var(--space-md); background: var(--primary-container);
border-radius: var(--radius-md); color: var(--primary);
font-size: 0.875rem; font-weight: 700;
font-weight: 500; }
color: var(--on-surface-dim); }
text-decoration: none; }
} > .cta {
display: flex;
.topnav > nav > a.active { align-items: center;
background: var(--primary-container); gap: var(--space-sm);
color: var(--primary); height: 2.25rem;
font-weight: 700; padding: 0 var(--space-md);
} background: var(--primary);
color: var(--on-primary);
.topnav > .cta { border: none;
display: flex; border-radius: var(--radius-md);
align-items: center; font-size: 0.875rem;
gap: var(--space-sm); font-weight: 600;
height: 2.25rem; cursor: pointer;
padding: 0 var(--space-md); text-decoration: none;
background: var(--primary); flex-shrink: 0;
color: var(--on-primary); }
border: none; }
border-radius: var(--radius-md);
font-size: 0.875rem;
font-weight: 600;
cursor: pointer;
text-decoration: none;
flex-shrink: 0;
} }
main { main {
overflow-y: auto; overflow-y: auto;
} }
.main-content { .main-content {
padding: var(--space-md); padding: var(--space-md);
display: grid; display: grid;
grid-template-columns: 1fr 1fr; grid-template-columns: 1fr 1fr;
gap: var(--space-md); gap: var(--space-md);
align-content: start; align-content: start;
} }
.main-content > .horizontal-group { .main-content > .horizontal-group {
grid-column: 1 / -1; grid-column: 1 / -1;
} }
#orders-results { #orders-results {
grid-column: 1 / -1; grid-column: 1 / -1;
display: grid; display: grid;
grid-template-columns: 1fr 1fr; grid-template-columns: 1fr 1fr;
gap: var(--space-md); gap: var(--space-md);
} }
@media (max-width: 48em) { @media (max-width: 48em) {
.topnav { .topnav {
padding: 0 var(--space-sm); padding: 0 var(--space-sm);
gap: var(--space-xs); gap: var(--space-xs);
} }
.topnav > nav > a span:not(.material-symbols-outlined) { .topnav > nav > a span:not(.material-symbols-outlined) {
display: none; display: none;
} }
.topnav > .cta span:not(.material-symbols-outlined) { .topnav > .cta span:not(.material-symbols-outlined) {
display: none; display: none;
} }
.topnav > .cta { .topnav > .cta {
width: 2.25rem; width: 2.25rem;
height: 2.25rem; height: 2.25rem;
padding: 0; padding: 0;
border-radius: 50%; border-radius: 50%;
justify-content: center; justify-content: center;
} }
.main-content { .main-content {
padding: var(--space-sm); padding: var(--space-sm);
} }
.topnav > h1 { .topnav > h1 {
font-size: 1rem; font-size: 1rem;
} }
} }

48
server/templates/layout.templ
View file

@ -6,7 +6,7 @@ templ Layout(title string, main templ.Component) {
<head> <head>
<meta charset="UTF-8"/> <meta charset="UTF-8"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0"/> <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
<title>{ title } — Zamówienia ciast</title> <title>Zamówienia ciast</title>
<link rel="stylesheet" href="/static/fonts/inter.css"/> <link rel="stylesheet" href="/static/fonts/inter.css"/>
<link rel="stylesheet" href="/static/fonts/material.css"/> <link rel="stylesheet" href="/static/fonts/material.css"/>
<link rel="stylesheet" href="/static/style.css"/> <link rel="stylesheet" href="/static/style.css"/>
@ -14,62 +14,36 @@ templ Layout(title string, main templ.Component) {
<script src="/static/order.js"></script> <script src="/static/order.js"></script>
</head> </head>
<body> <body>
<header class="topnav"> <header>
<h1>{ title }</h1>
<nav> <nav>
<a href="/orders" hx-get="/orders" hx-target="#main" hx-swap="outerHTML" hx-push-url="true"> <a href="/orders" hx-boost="true" hx-target="main" hx-select="main" hx-select-oob="title" hx-swap="outerHTML">
<span class="material-symbols-outlined">dashboard</span> <span class="material-symbols-outlined">dashboard</span>
<span>Panel główny</span> <span>Panel główny</span>
</a> </a>
<a href="/cakes" hx-get="/cakes" hx-target="#main" hx-swap="outerHTML" hx-push-url="true"> <a href="/cakes" hx-boost="true" hx-target="main" hx-select="main" hx-select-oob="title" hx-swap="outerHTML">
<span class="material-symbols-outlined">inventory_2</span> <span class="material-symbols-outlined">inventory_2</span>
<span>Katalog</span> <span>Katalog</span>
</a> </a>
<a href="/blocked" hx-get="/blocked" hx-target="#main" hx-swap="outerHTML" hx-push-url="true"> <a href="/blocked" hx-boost="true" hx-target="main" hx-select="main" hx-select-oob="title" hx-swap="outerHTML">
<span class="material-symbols-outlined">event_busy</span> <span class="material-symbols-outlined">event_busy</span>
<span>Terminy zablokowane</span> <span>Terminy zablokowane</span>
</a> </a>
</nav> </nav>
<a href="/order" class="cta" hx-get="/order" hx-target="#main" hx-swap="outerHTML" hx-push-url="true"> <a href="/order" class="cta" hx-boost="true" hx-target="main" hx-select="main" hx-select-oob="title" hx-swap="outerHTML">
<span class="material-symbols-outlined">add</span> <span class="material-symbols-outlined">add</span>
<span>Nowe zamówienie</span> <span>Nowe zamówienie</span>
</a> </a>
</header> </header>
<main id="main"> <main>
<div class="main-content"> @main
@main
</div>
</main> </main>
</body> </body>
</html> </html>
} }
templ MainContent(title string, main templ.Component) { templ MainContent(title string, main templ.Component) {
<header class="topnav" hx-swap-oob="true"> <title>{ title }</title>
<h1>{ title }</h1> <main>
<nav> @main
<a href="/orders" hx-get="/orders" hx-target="#main" hx-swap="outerHTML" hx-push-url="true">
<span class="material-symbols-outlined">dashboard</span>
<span>Panel główny</span>
</a>
<a href="/cakes" hx-get="/cakes" hx-target="#main" hx-swap="outerHTML" hx-push-url="true">
<span class="material-symbols-outlined">inventory_2</span>
<span>Katalog</span>
</a>
<a href="/blocked" hx-get="/blocked" hx-target="#main" hx-swap="outerHTML" hx-push-url="true">
<span class="material-symbols-outlined">event_busy</span>
<span>Terminy zablokowane</span>
</a>
</nav>
<a href="/order" class="cta" hx-get="/order" hx-target="#main" hx-swap="outerHTML" hx-push-url="true">
<span class="material-symbols-outlined">add</span>
<span>Nowe zamówienie</span>
</a>
</header>
<main id="main">
<title hx-swap-oob="true">{ title } — Zamówienia ciast</title>
<div class="main-content">
@main
</div>
</main> </main>
} }