fix: break import cycle by moving Layout to shared package and fix import paths

2026-04-20 16:59:55 +02:00
parent b57d689468
commit 8088ab7105
13 changed files with 60 additions and 48 deletions
--- a/web/shared/layout/layout.templ
+++ b/web/shared/layout/layout.templ
@@ -0,0 +1,92 @@
+package layout
+
+import "mal/web/components/icons"
+
+templ Layout(title string, showHeader bool) {
+	<!DOCTYPE html>
+	<html lang="en">
+		<head>
+			<meta charset="UTF-8"/>
+			<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+			<title>{ title }</title>
+			<link rel="icon" type="image/svg+xml" href="/static/favicon.svg"/>
+			<link rel="stylesheet" href="/dist/tailwind.css"/>
+			<script src="https://unpkg.com/htmx.org@1.9.11"></script>
+			<script src="/dist/discover.js" defer></script>
+			<script src="/dist/anime.js" defer></script>
+			<script src="/dist/timezone.js" defer></script>
+			<script src="/dist/player.js" defer></script>
+		</head>
+		<body
+			class="min-h-screen bg-(--bg) text-(--text) font-(--font) text-sm leading-normal"
+		>
+			if showHeader {
+				<header class="sticky top-0 z-100 bg-(--header)">
+					<div
+						class="mx-auto flex w-full max-w-screen-2xl items-center gap-4 px-4 py-3 max-lg:flex-wrap max-lg:gap-3"
+					>
+						<div
+							class="flex min-w-0 items-center gap-5 max-lg:w-full max-lg:flex-wrap max-lg:gap-3"
+							data-search-root
+						>
+							<a
+								href="/"
+								class="inline-flex items-center text-(--accent)"
+								aria-label="mal logo"
+							>
+								@icons.LogoIcon("h-7 w-7")
+							</a>
+							<div class="flex flex-wrap gap-3 text-sm max-lg:w-full max-lg:gap-2">
+								<a
+									class="text-(--text-muted) no-underline hover:text-(--text) hover:no-underline"
+									href="/discover"
+								>
+									Discover
+								</a>
+								<a
+									class="text-(--text-muted) no-underline hover:text-(--text) hover:no-underline"
+									href="/continue-watching"
+								>
+									Continue watching
+								</a>
+								<a
+									class="text-(--text-muted) no-underline hover:text-(--text) hover:no-underline"
+									href="/watchlist"
+								>
+									Watchlist
+								</a>
+							</div>
+						</div>
+						<div
+							class="relative ml-auto min-w-60 w-full max-w-md max-lg:ml-0"
+							data-search-root
+						>
+							<form action="/search" method="GET" class="w-full" id="search-form">
+								<input
+									type="text"
+									id="search-input"
+									name="q"
+									class="h-9 w-full border border-transparent bg-(--surface-search) px-3 text-(--text) transition-colors duration-120 placeholder:text-(--text-faint) focus:border-(--surface-search-focus-border) focus:outline-none"
+									placeholder="Search anime..."
+									autocomplete="off"
+								/>
+									<div
+										id="search-dropdown"
+										class="absolute inset-x-0 top-full mt-0.5 z-50 max-h-screen overflow-y-auto bg-(--panel)"
+										data-search-results-container
+									></div>
+							</form>
+						</div>
+					</div>
+				</header>
+			}
+			<main class={
+				"mx-auto w-full max-w-screen-2xl px-4 pt-5 pb-8 max-lg:px-3 max-lg:pb-6",
+				templ.KV("flex min-h-screen items-center justify-center px-4 py-0", !showHeader),
+			}>
+				{ children... }
+			</main>
+			<script src="/dist/search.js"></script>
+		</body>
+	</html>
+}