From 46e5213b367fe679baaa7d7713ec62dc4d5b3ea4 Mon Sep 17 00:00:00 2001
From: "Alexander \"Arav\" Andreev" <me@arav.su>
Date: Sun, 30 Jun 2024 03:00:03 +0400
Subject: [PATCH] Place navigation inside a base template.

---
 web/base.templ | 54 +++++++++++++++++++++++---------------------------
 1 file changed, 25 insertions(+), 29 deletions(-)

diff --git a/web/base.templ b/web/base.templ
index 19808e7..748e900 100644
--- a/web/base.templ
+++ b/web/base.templ
@@ -33,7 +33,30 @@ templ base(title, description, keywords, canonical string, head templ.Component)
 					<text y="7" textLength="360" lengthAdjust="spacingAndGlyphs">Arav's dwelling</text>
 					<text y="25" textLength="360" lengthAdjust="spacingAndGlyphs">Welcome to my sacred place, wanderer</text>
 				</svg>
-				@navigation(title)
+				{{ mainNavSections := []string{"Stuff", "Mindflow", "About", "Guestbook"} }}
+				{{ mainNavLinks := []templ.SafeURL{"/stuff", "/mindflow", "/about", "/guestbook"} }}
+				<nav>
+					<ul>
+						if title != "" {
+							<li><a href="/">Home</a></li>
+						}
+						for i, s := range mainNavSections {
+							if strings.HasSuffix(title, s) {
+								{{ continue }}
+							}
+							<li><a href={ mainNavLinks[i] }>{ s }</a></li>
+						}
+					</ul>
+					if title != "" {
+						<h1>
+							if strings.HasSuffix(title, "- Stuff") {
+								Stuff
+							} else {
+								{ title }
+							}
+						</h1>
+					}
+				</nav>
 			</header>
 			<main>
 				{ children... }
@@ -45,31 +68,4 @@ templ base(title, description, keywords, canonical string, head templ.Component)
 			</footer>
 		</body>
 	</html>
-}
-
-templ navigation(title string) {
-	{{ sections := []string{"Stuff", "Mindflow", "About", "Guestbook"} }}
-	{{ links := []templ.SafeURL{"/stuff", "/mindflow", "/about", "/guestbook"} }}
-	<nav>
-		<ul>
-			if title != "" {
-				<li><a href="/">Home</a></li>
-			}
-			for i, s := range sections {
-				if strings.HasSuffix(title, s) {
-					{{ continue }}
-				}
-				<li><a href={ links[i] }>{ s }</a></li>
-			}
-		</ul>
-		if title != "" {
-			<h1>
-				if strings.HasSuffix(title, "- Stuff") {
-					Stuff
-				} else {
-					{ title }
-				}
-			</h1>
-		}
-	</nav>
-}
+}
\ No newline at end of file