fix(gallery): use component template

.gitea/workflows/release.yaml

@@ -27,3 +27,11 @@ jobs:
           file: ./Dockerfile
           push: true
           tags: "git.schreifuchs.ch/schreifuchs/schreifuchs.ch:${{ github.ref_name }},git.schreifuchs.ch/schreifuchs/schreifuchs.ch:latest"
+      - name: Create Gitea Release
+        uses: https://gitea.com/actions/gitea-release-action@v1
+        with:
+          state: "published"
+          title: "Release ${{ github.ref_name }}"
+          notes: "Automated release for tag ${{ github.ref_name }}"
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

internal/components/translate/context.go

@@ -53,13 +53,21 @@ func Path(ctx context.Context, pp ...string) string {
 }
 
 func PathForLang(ctx context.Context, lang string, pp ...string) string {
+	slog.Debug("computing path for lang", "pp", pp, "lang", lang)
 	s, ok := ctx.Value(serviceKey).(*Service)
 	if !ok {
 		slog.Error("could not extract translation service from context for translating path", "ctx", ctx, "path", pp)
 		return path.Join(pp...)
 	}
 
+	// remove leading ""
+	for len(pp) > 0 && pp[0] == "" {
+		pp = pp[1:]
+	}
+
 	if len(pp) > 0 {
+
+		slog.Debug("computing path for lang", "pp", pp, "lang", lang, "pp[0]", pp[0], "translations", s.translations)
 		if _, ok := s.translations[pp[0]]; ok {
 			pp = pp[1:]
 		}

internal/handlers/restgallery/controller.go

@@ -27,7 +27,7 @@ func (h *Handler) gallery(w http.ResponseWriter, r *http.Request) {
 		ctx = templer.AppendHeader(ctx, fmt.Sprintf(`<link rel="preload" href="%s?w=800" as="image" />`, image.URL()))
 	}
 
-	h.r.Render(ctx, w, r, pages.GallerySet(imgs))
+	h.r.RenderPage(ctx, w, r, pages.GallerySet(imgs))
 }
 
 func (h *Handler) image(w http.ResponseWriter, r *http.Request) {
@@ -41,5 +41,5 @@ func (h *Handler) image(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	h.r.Render(r.Context(), w, r, pages.GalleryImage(uid, next, prev))
+	h.r.RenderComponent(r.Context(), w, r, pages.GalleryImage(uid, next, prev))
 }

internal/handlers/restgallery/resource.go

@@ -40,5 +40,6 @@ type galleryService interface {
 	GetPrevAndNext(ctx context.Context, uid string) (previous *gallery.Image, next *gallery.Image, err error)
 }
 type renderer interface {
-	Render(ctx context.Context, w io.Writer, r *http.Request, component templ.Component)
+	RenderPage(ctx context.Context, w io.Writer, r *http.Request, component templ.Component)
+	RenderComponent(ctx context.Context, w io.Writer, r *http.Request, component templ.Component)
 }

internal/handlers/resthome/controller.go

@@ -17,7 +17,7 @@ func (h *Handler) home(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	h.r.Render(r.Context(), w, r, pages.Home(pageHeaders))
+	h.r.RenderPage(r.Context(), w, r, pages.Home(pageHeaders))
 }
 
 func (h *Handler) page(w http.ResponseWriter, r *http.Request) {
@@ -43,5 +43,5 @@ func (h *Handler) page(w http.ResponseWriter, r *http.Request) {
 
 	ctx = templer.PageTitle(ctx, page.Title)
 
-	h.r.Render(ctx, w, r, pages.ContentPage(page))
+	h.r.RenderPage(ctx, w, r, pages.ContentPage(page))
 }

internal/handlers/resthome/resource.go

@@ -33,5 +33,5 @@ type pageService interface {
 	GetPage(ctx context.Context, uid string) (page.Page, error)
 }
 type renderer interface {
-	Render(ctx context.Context, w io.Writer, r *http.Request, component templ.Component)
+	RenderPage(ctx context.Context, w io.Writer, r *http.Request, component templ.Component)
 }

web/layouts/base.templ

@@ -7,7 +7,7 @@ import (
 	"strings"
 )
 
-templ Head(cfg config.Cfg, title string) {
+templ head(cfg config.Cfg, title string) {
 	<head>
 		<meta charset="UTF-8"/>
 		<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
@@ -23,14 +23,35 @@ templ Head(cfg config.Cfg, title string) {
 			@templ.Raw(h)
 		}
 	</head>
-	{ children... }
 }
 
 templ Base(cfg config.Cfg, title string) {
 	<!DOCTYPE html>
 	<html lang={ translate.Language(ctx) }>
-		@Head(cfg, title)
-		<body class="bg-black dark" hx-boost="true" hx-target="main" hx-ext="head-support,preload,preload-links">
+		@head(cfg, title)
+		<body class="bg-black dark" hx-boost="true" hx-target="body" hx-ext="head-support,preload,preload-links">
+			@body() {
+				{ children... }
+			}
+		</body>
+	</html>
+}
+
+templ Page(cfg config.Cfg, title string) {
+	@head(cfg, title)
+	@body() {
+		{ children... }
+	}
+}
+
+templ Component() {
+	for _, h := range templer.GetHeader(ctx) {
+		@templ.Raw(h)
+	}
+	{ children... }
+}
+
+templ body() {
 	<header
 		class="fixed z-50 mix-blend-difference p-1 w-full flex justify-between items-start"
 	>
@@ -52,6 +73,4 @@ templ Base(cfg config.Cfg, title string) {
 	<main class="text-white">
 		{ children... }
 	</main>
-		</body>
-	</html>
 }

web/layouts/render.go

@@ -2,7 +2,6 @@ package layouts
 
 import (
 	"context"
-	"fmt"
 	"io"
 	"log/slog"
 	"net/http"
@@ -22,12 +21,9 @@ func New(cfg config.Cfg) *Layouts {
 	}
 }
 
-// Render renders a page. If the query paramenter "c" is set
+// RenderPage renders a page. If the query paramenter HX-Request is set
 // the component gets rendered without the layout
-func (l *Layouts) Render(ctx context.Context, w io.Writer, r *http.Request, component templ.Component) {
-	withLayout := !r.URL.Query().Has("c")
-	fmt.Println("layout: ", withLayout)
-
+func (l *Layouts) RenderPage(ctx context.Context, w io.Writer, r *http.Request, component templ.Component) {
 	title := templer.GetTitle(ctx, "Schreifuchs")
 
 	slog.Debug("HX-Request", "value", r.Header.Get("HX-Request"))
@@ -36,10 +32,20 @@ func (l *Layouts) Render(ctx context.Context, w io.Writer, r *http.Request, comp
 		component = Base(l.cfg, title)
 	} else {
 		ctx = templ.WithChildren(ctx, component)
-		component = Head(l.cfg, title)
+		component = Page(l.cfg, title)
 	}
 
 	if err := component.Render(ctx, w); err != nil {
 		slog.Error("error while rendering component", "err", err, "ctx", ctx)
 	}
 }
+
+// RenderComponent renders a component alone.
+func (l *Layouts) RenderComponent(ctx context.Context, w io.Writer, r *http.Request, component templ.Component) {
+	ctx = templ.WithChildren(ctx, component)
+	component = Component()
+
+	if err := component.Render(ctx, w); err != nil {
+		slog.Error("error while rendering component", "err", err, "ctx", ctx)
+	}
+}