chore: use better scaling kernel

Reviewed-on: #1

.air.toml

@@ -1,6 +1,7 @@
 root = "."
 testdata_dir = "testdata"
 tmp_dir = "tmp"
+env_files = [".env"]
 
 [build]
   args_bin = []

.dockerignore

@@ -8,6 +8,5 @@ build
 docker-compose.yml
 Dockerfile
 README.md
-TODO_NEXTCLOUD.md
-GEMINI.md
 pnpm-workspace.yaml
+

.gitignore

@@ -3,6 +3,9 @@ node_modules
 /tmp
 /tmp/*
 /build
+
 .env
 .env.*
 !.env.example
+
+/web/**/*_templ.go

cmd/schreifuchs-ch/main.go

@@ -1,22 +1,38 @@
 package main
 
 import (
+	"context"
 	"log/slog"
 	"os"
+	"os/signal"
 
+	"git.schreifuchs.ch/schreifuchs/schreifuchs.ch/internal/pkg/config"
 	"git.schreifuchs.ch/schreifuchs/schreifuchs.ch/internal/server"
 )
 
 func main() {
-	server := server.NewServer()
+	ctx := context.Background()
+	ctx, cancle := context.WithCancel(ctx)
+	defer cancle()
+
+	go func() {
+		sigint := make(chan os.Signal, 1)
+		signal.Notify(sigint, os.Interrupt)
+		<-sigint
+
+		cancle()
+	}()
 
 	slog.SetLogLoggerLevel(slog.LevelDebug)
-	slog.Info("Server started", "addr", server.Addr)
 
-	err := server.ListenAndServe()
+	cfg, err := config.Read(ctx)
 	if err != nil {
-		slog.Error("Server failed to start", "error", err)
-		os.Exit(1)
-	}
+		slog.Error("could not read configuaration", "err", err)
 	}
 
+	err = server.Start(ctx, cfg)
+	if err != nil {
+		slog.Error("error while serving", "err", err)
+		return
+	}
+}

go.mod

@@ -8,6 +8,7 @@ require (
 	github.com/a-h/templ v0.3.977
 	github.com/alicebob/miniredis/v2 v2.36.1
 	github.com/gomarkdown/markdown v0.0.0-20260217112301-37c66b85d6ab
+	github.com/sethvargo/go-envconfig v1.3.0
 	github.com/studio-b12/gowebdav v0.12.0
 	github.com/valkey-io/valkey-go v1.0.72
 	golang.org/x/image v0.36.0

go.sum

@@ -31,6 +31,8 @@ github.com/onsi/gomega v1.38.3 h1:eTX+W6dobAYfFeGC2PV6RwXRu/MyT+cQguijutvkpSM=
 github.com/onsi/gomega v1.38.3/go.mod h1:ZCU1pkQcXDO5Sl9/VVEGlDyp+zm0m1cmeG5TOzLgdh4=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/sethvargo/go-envconfig v1.3.0 h1:gJs+Fuv8+f05omTpwWIu6KmuseFAXKrIaOZSh8RMt0U=
+github.com/sethvargo/go-envconfig v1.3.0/go.mod h1:JLd0KFWQYzyENqnEPWWZ49i4vzZo/6nRidxI8YvGiHw=
 github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/studio-b12/gowebdav v0.12.0 h1:kFRtQECt8jmVAvA6RHBz3geXUGJHUZA6/IKpOVUs5kM=

internal/components/images/controller.go

@@ -10,12 +10,13 @@ import (
 	"hash/fnv"
 	"image"
 	"image/jpeg"
-	_ "image/jpeg"
 	_ "image/png"
 	"io"
 	"strings"
 	"time"
 
+	_ "golang.org/x/image/webp"
+
 	"github.com/valkey-io/valkey-go"
 )
 
@@ -59,6 +60,13 @@ func (s *Service) getImage(uid string) (file []byte, mimeType string, err error)
 }
 
 func (s *Service) GetImage(ctx context.Context, uid string, options Options) (img io.Reader, mimeType string, err error) {
+	if err = s.seph.Acquire(ctx, 1); err != nil {
+		err = fmt.Errorf("could not Acquire semaphore: %w", err)
+		return
+
+	}
+	defer s.seph.Release(1)
+
 	rawImage, mimeType, err := s.getImage(uid)
 	if err != nil {
 		return
@@ -82,7 +90,7 @@ func (s *Service) GetImage(ctx context.Context, uid string, options Options) (im
 	outBuff := bytes.NewBuffer(make([]byte, 0, 1024))
 
 	if options.Quality == 0 {
-		options.Quality = 80
+		options.Quality = s.cfg.Quality
 	}
 
 	err = jpeg.Encode(outBuff, decImage, &jpeg.Options{Quality: options.Quality})

internal/components/images/resorce.go

@@ -3,7 +3,9 @@ package images
 import (
 	"os"
 
+	"git.schreifuchs.ch/schreifuchs/schreifuchs.ch/internal/pkg/config"
 	"github.com/valkey-io/valkey-go"
+	"golang.org/x/sync/semaphore"
 )
 
 type Options struct {
@@ -15,12 +17,16 @@ type Options struct {
 type Service struct {
 	fs    fileSystem
 	cache valkey.Client
+	seph  *semaphore.Weighted
+	cfg   *config.ImageConfig
 }
 
-func New(fs fileSystem, cache valkey.Client) *Service {
+func New(fs fileSystem, cfg *config.ImageConfig, cache valkey.Client) *Service {
 	return &Service{
 		fs:    fs,
 		cache: cache,
+		seph:  semaphore.NewWeighted(cfg.Concurency),
+		cfg:   cfg,
 	}
 }
 

internal/components/images/scaling.go

@@ -14,7 +14,7 @@ func scale(src image.Image, options Options) image.Image {
 	)
 
 	// Resize:
-	draw.BiLinear.Scale(dst, dst.Rect, src, src.Bounds(), draw.Over, nil)
+	draw.ApproxBiLinear.Scale(dst, dst.Rect, src, src.Bounds(), draw.Over, nil)
 
 	// Encode to `output`:
 	return dst

internal/components/page/html.go

@@ -56,6 +56,9 @@ func imageMiddleware(page PageHeader) func(w io.Writer, node ast.Node, entering
 
 			img.Attribute = &ast.Attribute{Attrs: map[string][]byte{
 				"srcset":        []byte(images.SourceSet(src)),
+				"fetchpriority": []byte("low"),
+				"loading":       []byte("lazy"),
+				"class":         []byte("min-h-48"),
 				"src":           []byte(src),
 			}}
 			// // img.Attrs["srcset"] =

internal/components/page/page.go

@@ -4,13 +4,12 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"log/slog"
 	"regexp"
 	"strings"
 
 	"git.schreifuchs.ch/schreifuchs/schreifuchs.ch/internal/components/images"
 	"git.schreifuchs.ch/schreifuchs/schreifuchs.ch/internal/components/translate"
-	"git.schreifuchs.ch/schreifuchs/schreifuchs.ch/internal/filesystem"
+	"git.schreifuchs.ch/schreifuchs/schreifuchs.ch/internal/pkg/filesystem"
 	"github.com/studio-b12/gowebdav"
 )
 
@@ -57,8 +56,6 @@ func (s *Service) getPageHeaders(ctx context.Context, uid string) (page PageHead
 		}
 	}
 
-	slog.Debug("loaded page infos", "cover", coverImage, "content", contentMD)
-
 	page.md, err = s.fs.Read(contentMD.Path())
 	if err != nil {
 		return

internal/components/page/resource.go

@@ -1,7 +1,7 @@
 package page
 
 import (
-	"git.schreifuchs.ch/schreifuchs/schreifuchs.ch/internal/filesystem"
+	"git.schreifuchs.ch/schreifuchs/schreifuchs.ch/internal/pkg/filesystem"
 )
 
 type Service struct {

internal/components/translate/context.go

@@ -65,7 +65,7 @@ func PathForLang(ctx context.Context, lang string, pp ...string) string {
 		}
 	}
 
-	return path.Join(append([]string{lang}, pp...)...)
+	return "/" + path.Join(append([]string{lang}, pp...)...)
 }
 
 func (s *Service) SupportedLanguages() (languages []string) {

internal/handlers/resthome/controller.go

@@ -3,7 +3,6 @@ package resthome
 import (
 	"net/http"
 
-	"git.schreifuchs.ch/schreifuchs/schreifuchs.ch/web/layouts"
 	"git.schreifuchs.ch/schreifuchs/schreifuchs.ch/web/pages"
 )
 
@@ -14,7 +13,7 @@ func (h *Handler) home(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	layouts.Render(r.Context(), w, r, pages.Home(pageHeaders))
+	h.r.Render(r.Context(), w, r, pages.Home(pageHeaders))
 }
 
 func (h *Handler) page(w http.ResponseWriter, r *http.Request) {
@@ -26,5 +25,5 @@ func (h *Handler) page(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	layouts.Render(r.Context(), w, r, pages.ContentPage(page))
+	h.r.Render(r.Context(), w, r, pages.ContentPage(page))
 }

internal/handlers/resthome/resource.go

@@ -2,18 +2,22 @@ package resthome
 
 import (
 	"context"
+	"io"
 	"net/http"
 
 	"git.schreifuchs.ch/schreifuchs/schreifuchs.ch/internal/components/page"
+	"github.com/a-h/templ"
 )
 
 type Handler struct {
 	src pageService
+	r   renderer
 }
 
-func New(mux *http.ServeMux, srv pageService) *Handler {
+func New(mux *http.ServeMux, renderer renderer, srv pageService) *Handler {
 	h := &Handler{
 		src: srv,
+		r:   renderer,
 	}
 
 	mux.HandleFunc("GET /{$}", h.home)
@@ -25,3 +29,6 @@ type pageService interface {
 	GetPages(ctx context.Context) ([]page.PageHeader, error)
 	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)
+}

internal/pkg/config/default.go

@@ -0,0 +1,14 @@
+package config
+
+func Default() Cfg {
+	return Cfg{
+		Image: &ImageConfig{
+			Concurency: 10,
+			Quality:    80,
+		},
+		Tracking: &UmamiConfig{
+			ScriptSrc: "https://umami.schreifuchs.ch/script.js",
+			WebsiteID: "54d8a379-77d5-4c20-b46d-5c9a6c9e39bd",
+		},
+	}
+}

internal/pkg/config/resource.go

@@ -0,0 +1,62 @@
+package config
+
+import (
+	"context"
+
+	"github.com/sethvargo/go-envconfig"
+)
+
+type Cfg struct {
+	FileSystem *WebdavConfig `env:", prefix=FILESYSTEM_"`
+	Cache      *ValkeyConfig `env:", prefix=CACHE_"`
+	Image      *ImageConfig  `env:", prefix=IMAGE_"`
+	Tracking   *UmamiConfig  `env:", prefix=TRACKING_"`
+}
+
+type WebdavConfig struct {
+	URL      string `env:"URL"`
+	User     string `env:"USERNAME"`
+	Password string `env:"PASSWORD"`
+}
+
+type ValkeyConfig struct {
+	ClientName string `env:"CLIENTNAME"`
+	Username   string `env:"USERNAME"`
+	Password   string `env:"PASSWORD"`
+
+	// InitAddress point to valkey nodes.
+	// Valkey will connect to them one by one and issue a CLUSTER SLOT command to initialize the cluster client until success.
+	// If len(InitAddress) == 1 and the address is not running in cluster mode, valkey will fall back to the single client mode.
+	// If ClientOption.Sentinel.MasterSet is set, then InitAddress will be used to connect sentinels
+	// You can bypass this behavior by using ClientOption.ForceSingleClient.
+	InitAddress []string `env:"ADDRESS"`
+}
+
+type ImageConfig struct {
+	Concurency int64 `env:"CONCURENCY"`
+	Quality    int   `env:"QUALITY"`
+}
+
+type UmamiConfig struct {
+	ScriptSrc string `env:"SCRIPT_SRC"`
+	WebsiteID string `env:"WEBSITE_ID"`
+}
+
+func Read(ctx context.Context) (cfg Cfg, err error) {
+	cfg = Default()
+	err = envconfig.ProcessWith(ctx, &envconfig.Config{
+		Target: &cfg,
+
+		// All fields will use a ";" delimiter and "@" separator, unless locally
+		// overridden.
+		DefaultDelimiter: ";",
+		DefaultSeparator: "@",
+
+		Lookuper: envconfig.MultiLookuper(secretLookuper(), envconfig.OsLookuper()),
+	})
+	if err != nil {
+		return
+	}
+
+	return
+}

internal/pkg/config/secrets.go

@@ -0,0 +1,36 @@
+package config
+
+import (
+	"io"
+	"log/slog"
+	"os"
+	"strings"
+
+	"github.com/sethvargo/go-envconfig"
+)
+
+func secretLookuper() envconfig.LookuperFunc {
+	return func(key string) (string, bool) {
+		fileName := os.Getenv(key + "_FILE")
+		if fileName == "" {
+			return "", false
+		}
+
+		file, err := os.Open(fileName)
+		if err != nil {
+			slog.Error("could not read secret file", "path", fileName)
+			return "", false
+		}
+
+		defer file.Close()
+
+		sb := &strings.Builder{}
+
+		_, err = io.Copy(sb, file)
+		if err != nil {
+			return "", false
+		}
+
+		return sb.String(), true
+	}
+}

internal/server/middlewares.go

@@ -0,0 +1,46 @@
+package server
+
+import (
+	"fmt"
+	"log/slog"
+	"net/http"
+	"time"
+)
+
+type captureWriter struct {
+	http.ResponseWriter
+	code int
+}
+
+func (c *captureWriter) WriteHeader(statusCode int) {
+	c.code = statusCode
+	c.ResponseWriter.WriteHeader(statusCode)
+}
+
+func (s *Server) loggingMiddleware(next http.Handler) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		start := time.Now()
+		cw := &captureWriter{
+			ResponseWriter: w,
+			code:           200,
+		}
+		next.ServeHTTP(cw, r)
+		slog.Info("request",
+			"method", r.Method,
+			"path", r.URL.Path,
+			"duration", time.Since(start),
+			"status", cw.code,
+		)
+	})
+}
+
+// cacheMiddleware adds Cache-Control headers to the response.
+func cacheMiddleware(maxAge time.Duration) func(next http.Handler) http.Handler {
+	return func(next http.Handler) http.Handler {
+		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			w.Header().Set("Cache-Control", fmt.Sprintf("public, max-age=%.0f", maxAge.Seconds()))
+			w.Header().Set("Vary", "HX-Request,Accept-Language,Accept-Encoding")
+			next.ServeHTTP(w, r)
+		})
+	}
+}

internal/server/routes.go

@@ -3,17 +3,17 @@ package server
 import (
 	"log/slog"
 	"net/http"
-	"os"
 	"time"
 
 	"git.schreifuchs.ch/schreifuchs/schreifuchs.ch/internal/components/images"
 	"git.schreifuchs.ch/schreifuchs/schreifuchs.ch/internal/components/page"
 	"git.schreifuchs.ch/schreifuchs/schreifuchs.ch/internal/components/translate"
-	"git.schreifuchs.ch/schreifuchs/schreifuchs.ch/internal/filesystem"
 	"git.schreifuchs.ch/schreifuchs/schreifuchs.ch/internal/handlers/resthome"
 	"git.schreifuchs.ch/schreifuchs/schreifuchs.ch/internal/handlers/restimage"
-	"git.schreifuchs.ch/schreifuchs/schreifuchs.ch/internal/templer"
+	"git.schreifuchs.ch/schreifuchs/schreifuchs.ch/internal/pkg/filesystem"
+	"git.schreifuchs.ch/schreifuchs/schreifuchs.ch/internal/pkg/templer"
 	"git.schreifuchs.ch/schreifuchs/schreifuchs.ch/web"
+	"git.schreifuchs.ch/schreifuchs/schreifuchs.ch/web/layouts"
 	"github.com/studio-b12/gowebdav"
 	"github.com/valkey-io/valkey-go"
 )
@@ -22,7 +22,7 @@ func (s *Server) RegisterRoutes() (h http.Handler) {
 	mux := http.NewServeMux()
 
 	registerStatic(mux)
-	mux.Handle("/", registerOther())
+	mux.Handle("/", s.registerOther())
 
 	h = mux
 	h = templer.Middleware(h)
@@ -30,23 +30,18 @@ func (s *Server) RegisterRoutes() (h http.Handler) {
 	return h
 }
 
-func registerOther() (h http.Handler) {
+func (s *Server) registerOther() (h http.Handler) {
 	mux := http.NewServeMux()
-
-	webdavClient := gowebdav.NewClient("https://cloud.schreifuchs.ch/remote.php/dav/files/test/website", "test", os.Getenv("TEST_PW"))
+	webdavClient := gowebdav.NewClient(s.cfg.FileSystem.URL, s.cfg.FileSystem.User, s.cfg.FileSystem.Password)
 	if err := webdavClient.Connect(); err != nil {
-		slog.Error("could not connect webdavClient", "err", err, "pw", os.Getenv("TEST_PW"))
+		slog.Error("could not connect webdavClient", "err", err)
 	}
 
 	var fs filesystem.FS = webdavClient
 
-	valkeyAddr := os.Getenv("VALKEY_ADDR")
-	if valkeyAddr == "" {
-		valkeyAddr = "127.0.0.1:6379"
-	}
 	valkeyClient, err := valkey.NewClient(valkey.ClientOption{
-		InitAddress: []string{valkeyAddr},
-		Password:    os.Getenv("VALKEY_PASSWORD"),
+		InitAddress: s.cfg.Cache.InitAddress,
+		Password:    s.cfg.Cache.Password,
 	})
 	if err != nil {
 		slog.Error("failed to create valkey client", "err", err)
@@ -54,8 +49,10 @@ func registerOther() (h http.Handler) {
 		fs = filesystem.NewCachedClient(webdavClient, valkeyClient, 5*time.Hour)
 	}
 
-	_ = resthome.New(mux, page.New(fs))
-	_ = restimage.New(mux, images.New(fs, valkeyClient))
+	renderer := layouts.New(s.cfg)
+
+	_ = resthome.New(mux, renderer, page.New(fs))
+	_ = restimage.New(mux, images.New(fs, s.cfg.Image, valkeyClient))
 
 	mux.Handle("/", http.FileServer(http.FS(web.GetStaticFS())))
 
@@ -63,18 +60,6 @@ func registerOther() (h http.Handler) {
 
 	h = mux
 	h = translator.Middleware(h)
-	h = cacheMiddleware(time.Second * 45)(h)
+	h = cacheMiddleware(time.Minute * 5)(h)
 	return h
 }
-
-func (s *Server) loggingMiddleware(next http.Handler) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		start := time.Now()
-		next.ServeHTTP(w, r)
-		slog.Info("request",
-			"method", r.Method,
-			"path", r.URL.Path,
-			"duration", time.Since(start),
-		)
-	})
-}

internal/server/server.go

@@ -1,34 +1,61 @@
 package server
 
 import (
+	"context"
 	"fmt"
+	"log/slog"
 	"net/http"
 	"os"
 	"strconv"
 	"time"
+
+	"git.schreifuchs.ch/schreifuchs/schreifuchs.ch/internal/pkg/config"
 )
 
 type Server struct {
 	port int
+	cfg  config.Cfg
 }
 
-func NewServer() *http.Server {
+func Start(ctx context.Context, cfg config.Cfg) (err error) {
 	port, _ := strconv.Atoi(os.Getenv("PORT"))
 	if port == 0 {
 		port = 8080
 	}
 	s := &Server{
 		port: port,
+		cfg:  cfg,
 	}
 
 	// Declare Server config
-	server := &http.Server{
+	srv := &http.Server{
 		Addr:         fmt.Sprintf(":%d", s.port),
 		Handler:      s.RegisterRoutes(),
 		IdleTimeout:  time.Minute,
 		ReadTimeout:  10 * time.Second,
 		WriteTimeout: 30 * time.Second,
 	}
+	idleConnsClosed := make(chan struct{})
 
-	return server
+	go func() {
+		<-ctx.Done()
+
+		slog.Info("shutting down server")
+
+		// Shutdown server when ctx done
+		if err = srv.Shutdown(context.Background()); err != nil {
+			// Error from closing listeners, or context timeout:
+			err = fmt.Errorf("error whilse shutting down server: %w", err)
+		}
+
+		close(idleConnsClosed)
+	}()
+
+	slog.Info("starting server", "address", srv.Addr)
+	if err := srv.ListenAndServe(); err != http.ErrServerClosed {
+		return fmt.Errorf("error while server ListenAndServe: %w", err)
+	}
+
+	<-idleConnsClosed
+	return err
 }

internal/server/static.go

@@ -1,7 +1,6 @@
 package server
 
 import (
-	"fmt"
 	"io/fs"
 	"log/slog"
 	"net/http"
@@ -27,7 +26,7 @@ func registerStatic(mux *http.ServeMux) {
 
 		path = "/" + path
 
-		slog.Info("registering file", "path", path)
+		slog.Debug("registering file", "path", path)
 
 		mux.Handle(path, fileServer)
 
@@ -38,14 +37,3 @@ func registerStatic(mux *http.ServeMux) {
 		panic(err)
 	}
 }
-
-// cacheMiddleware adds Cache-Control headers to the response.
-func cacheMiddleware(maxAge time.Duration) func(next http.Handler) http.Handler {
-	return func(next http.Handler) http.Handler {
-		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			w.Header().Set("Cache-Control", fmt.Sprintf("public, max-age=%.0f", maxAge.Seconds()))
-			w.Header().Set("Vary", "HX-Request,Accept-Language,Accept-Encoding")
-			next.ServeHTTP(w, r)
-		})
-	}
-}

package.json

@@ -6,7 +6,7 @@
   "scripts": {
     "build:css": "tailwindcss -i ./web/static/css/input.css -o ./web/static/css/output.css --minify",
     "watch:css": "tailwindcss -i ./web/static/css/input.css -o ./web/static/css/output.css --watch",
-    "build:js": "cp node_modules/htmx.org/dist/htmx.min.js web/static/js/htmx.min.js"
+    "build:js": "cp node_modules/htmx.org/dist/htmx.min.js web/static/js/htmx.min.js && cp ./node_modules/htmx-ext-preload/dist/preload.min.js ./web/static/js/preload.min.js"
   },
   "keywords": [],
   "author": "",
@@ -20,6 +20,7 @@
     "tailwindcss": "^4.1.18"
   },
   "dependencies": {
+    "htmx-ext-preload": "^2.1.2",
     "htmx.org": "^2.0.8"
   }
 }

pnpm-lock.yaml

@@ -8,6 +8,9 @@ importers:
 
   .:
     dependencies:
+      htmx-ext-preload:
+        specifier: ^2.1.2
+        version: 2.1.2
       htmx.org:
         specifier: ^2.0.8
         version: 2.0.8
@@ -277,6 +280,9 @@ packages:
   graceful-fs@4.2.11:
     resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==}
 
+  htmx-ext-preload@2.1.2:
+    resolution: {integrity: sha512-foD06XAITUUQApCUQnPexyJ6B7+4vFGMQ+t42unTVTGRu/CYHdAAt6oHg7eekPHT7NRnbM5hjnGVKtClryPabg==}
+
   htmx.org@2.0.8:
     resolution: {integrity: sha512-fm297iru0iWsNJlBrjvtN7V9zjaxd+69Oqjh4F/Vq9Wwi2kFisLcrLCiv5oBX0KLfOX/zG8AUo9ROMU5XUB44Q==}
 
@@ -617,6 +623,10 @@ snapshots:
 
   graceful-fs@4.2.11: {}
 
+  htmx-ext-preload@2.1.2:
+    dependencies:
+      htmx.org: 2.0.8
+
   htmx.org@2.0.8: {}
 
   is-extglob@2.1.1: {}

web/components/hello_templ.go

@@ -1,40 +0,0 @@
-// Code generated by templ - DO NOT EDIT.
-
-// templ: version: v0.3.977
-package components
-
-//lint:file-ignore SA4006 This context is only used if a nested component is present.
-
-import "github.com/a-h/templ"
-import templruntime "github.com/a-h/templ/runtime"
-
-func Hello() templ.Component {
-	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
-		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
-		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
-			return templ_7745c5c3_CtxErr
-		}
-		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
-		if !templ_7745c5c3_IsBuffer {
-			defer func() {
-				templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
-				if templ_7745c5c3_Err == nil {
-					templ_7745c5c3_Err = templ_7745c5c3_BufErr
-				}
-			}()
-		}
-		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var1 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var1 == nil {
-			templ_7745c5c3_Var1 = templ.NopComponent
-		}
-		ctx = templ.ClearChildren(ctx)
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 1, "<h1>Hello World</h1>")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		return nil
-	})
-}
-
-var _ = templruntime.GeneratedTemplate

web/components/imagetile.templ

@@ -8,6 +8,7 @@ templ ImageTile(src string) {
 			src={ src }
 			srcset={ images.SourceSet(src) }
 			fetchpriority="high"
+			loading="eager"
 			class="row-start-1 col-start-1 pointer-events-none w-full h-96 object-cover"
 		/>
 		<div class="row-start-1 col-start-1">

web/components/imagetile_templ.go

@@ -1,76 +0,0 @@
-// Code generated by templ - DO NOT EDIT.
-
-// templ: version: v0.3.977
-package components
-
-//lint:file-ignore SA4006 This context is only used if a nested component is present.
-
-import "github.com/a-h/templ"
-import templruntime "github.com/a-h/templ/runtime"
-
-import "git.schreifuchs.ch/schreifuchs/schreifuchs.ch/internal/components/images"
-
-func ImageTile(src string) templ.Component {
-	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
-		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
-		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
-			return templ_7745c5c3_CtxErr
-		}
-		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
-		if !templ_7745c5c3_IsBuffer {
-			defer func() {
-				templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
-				if templ_7745c5c3_Err == nil {
-					templ_7745c5c3_Err = templ_7745c5c3_BufErr
-				}
-			}()
-		}
-		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var1 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var1 == nil {
-			templ_7745c5c3_Var1 = templ.NopComponent
-		}
-		ctx = templ.ClearChildren(ctx)
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 1, "<div class=\"grid grid-cols-1 grid-rows-1\"><img src=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var2 string
-		templ_7745c5c3_Var2, templ_7745c5c3_Err = templ.JoinStringErrs(src)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `components/imagetile.templ`, Line: 8, Col: 12}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var2))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 2, "\" srcset=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var3 string
-		templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs(images.SourceSet(src))
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `components/imagetile.templ`, Line: 9, Col: 33}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var3))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 3, "\" fetchpriority=\"high\" class=\"row-start-1 col-start-1 pointer-events-none w-full h-96 object-cover\"><div class=\"row-start-1 col-start-1\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templ_7745c5c3_Var1.Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 4, "</div></div>")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		return nil
-	})
-}
-
-var _ = templruntime.GeneratedTemplate

web/layouts/base.templ

@@ -2,9 +2,10 @@ package layouts
 
 import "git.schreifuchs.ch/schreifuchs/schreifuchs.ch/internal/components/translate"
 import "strings"
-import "git.schreifuchs.ch/schreifuchs/schreifuchs.ch/internal/templer"
+import "git.schreifuchs.ch/schreifuchs/schreifuchs.ch/internal/pkg/templer"
+import "git.schreifuchs.ch/schreifuchs/schreifuchs.ch/internal/pkg/config"
 
-templ Base(title string) {
+templ Base(cfg config.Cfg, title string) {
 	<!DOCTYPE html>
 	<html lang={ translate.Language(ctx) }>
 		<head>
@@ -14,17 +15,18 @@ templ Base(title string) {
 			<link rel="icon" type="image/png" href="/favicon.png"/>
 			<link fetchpriority="high" href="/css/output.css" rel="stylesheet"/>
 			<script fetchpriority="low" src="/js/htmx.min.js"></script>
-			<script src="https://cdn.jsdelivr.net/npm/htmx-ext-preload@2.1.2" integrity="sha384-PRIcY6hH1Y5784C76/Y8SqLyTanY9rnI3B8F3+hKZFNED55hsEqMJyqWhp95lgfk" crossorigin="anonymous"></script>
+			<script src="/js/preload.min.js"></script>
+			<script src={ cfg.Tracking.ScriptSrc } data-website-id={ cfg.Tracking.WebsiteID }></script>
 		</head>
 		<body class="bg-black dark" hx-boost="true" hx-target="main" hx-ext="preload">
 			<header
 				class="fixed z-50 mix-blend-difference p-1 w-full flex justify-between items-start"
 			>
-				<a class="text-white text-2xl" href={ "/" + translate.Path(ctx, "") }>schreifuchs.ch</a>
+				<a class="text-white text-2xl" href={ translate.Path(ctx, "") }>schreifuchs.ch</a>
 				<nav class="flex gap-2 p-2">
 					for _, lang := range translate.SupportedLanguages(ctx) {
 						<a
-							href={ "/" + translate.PathForLang(ctx, lang, strings.Split(templer.Path(ctx), "/")...) }
+							href={ translate.PathForLang(ctx, lang, strings.Split(templer.Path(ctx), "/")...) }
 							hreflang={ lang }
 							data-no-translate
 							class="text-white hover:underline uppercase"

web/layouts/base_templ.go

@@ -1,140 +0,0 @@
-// Code generated by templ - DO NOT EDIT.
-
-// templ: version: v0.3.977
-package layouts
-
-//lint:file-ignore SA4006 This context is only used if a nested component is present.
-
-import "github.com/a-h/templ"
-import templruntime "github.com/a-h/templ/runtime"
-
-import "git.schreifuchs.ch/schreifuchs/schreifuchs.ch/internal/components/translate"
-import "strings"
-import "git.schreifuchs.ch/schreifuchs/schreifuchs.ch/internal/templer"
-
-func Base(title string) templ.Component {
-	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
-		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
-		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
-			return templ_7745c5c3_CtxErr
-		}
-		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
-		if !templ_7745c5c3_IsBuffer {
-			defer func() {
-				templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
-				if templ_7745c5c3_Err == nil {
-					templ_7745c5c3_Err = templ_7745c5c3_BufErr
-				}
-			}()
-		}
-		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var1 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var1 == nil {
-			templ_7745c5c3_Var1 = templ.NopComponent
-		}
-		ctx = templ.ClearChildren(ctx)
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 1, "<!doctype html><html lang=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var2 string
-		templ_7745c5c3_Var2, templ_7745c5c3_Err = templ.JoinStringErrs(translate.Language(ctx))
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `layouts/base.templ`, Line: 9, Col: 37}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var2))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 2, "\"><head><meta charset=\"UTF-8\"><meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\"><title>")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var3 string
-		templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs(title)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `layouts/base.templ`, Line: 13, Col: 17}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var3))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 3, "</title><link rel=\"icon\" type=\"image/png\" href=\"/favicon.png\"><link fetchpriority=\"high\" href=\"/css/output.css\" rel=\"stylesheet\"><script fetchpriority=\"low\" src=\"/js/htmx.min.js\"></script><script src=\"https://cdn.jsdelivr.net/npm/htmx-ext-preload@2.1.2\" integrity=\"sha384-PRIcY6hH1Y5784C76/Y8SqLyTanY9rnI3B8F3+hKZFNED55hsEqMJyqWhp95lgfk\" crossorigin=\"anonymous\"></script></head><body class=\"bg-black dark\" hx-boost=\"true\" hx-target=\"main\" hx-ext=\"preload\"><header class=\"fixed z-50 mix-blend-difference p-1 w-full flex justify-between items-start\"><a class=\"text-white text-2xl\" href=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var4 templ.SafeURL
-		templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinURLErrs("/" + translate.Path(ctx, ""))
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `layouts/base.templ`, Line: 23, Col: 71}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var4))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 4, "\">schreifuchs.ch</a><nav class=\"flex gap-2 p-2\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		for _, lang := range translate.SupportedLanguages(ctx) {
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 5, "<a href=\"")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			var templ_7745c5c3_Var5 templ.SafeURL
-			templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinURLErrs("/" + translate.PathForLang(ctx, lang, strings.Split(templer.Path(ctx), "/")...))
-			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `layouts/base.templ`, Line: 27, Col: 94}
-			}
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var5))
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 6, "\" hreflang=\"")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			var templ_7745c5c3_Var6 string
-			templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(lang)
-			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `layouts/base.templ`, Line: 28, Col: 22}
-			}
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var6))
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 7, "\" data-no-translate class=\"text-white hover:underline uppercase\">")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			var templ_7745c5c3_Var7 string
-			templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.JoinStringErrs(lang)
-			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `layouts/base.templ`, Line: 32, Col: 13}
-			}
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var7))
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 8, "</a>")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 9, "</nav></header><main class=\"text-white\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templ_7745c5c3_Var1.Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 10, "</main></body></html>")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		return nil
-	})
-}
-
-var _ = templruntime.GeneratedTemplate

web/layouts/render.go

@@ -7,19 +7,30 @@ import (
 	"log/slog"
 	"net/http"
 
+	"git.schreifuchs.ch/schreifuchs/schreifuchs.ch/internal/pkg/config"
 	"github.com/a-h/templ"
 )
 
+type Layouts struct {
+	cfg config.Cfg
+}
+
+func New(cfg config.Cfg) *Layouts {
+	return &Layouts{
+		cfg: cfg,
+	}
+}
+
 // Render renders a page. If the query paramenter "c" is set
 // the component gets rendered without the layout
-func Render(ctx context.Context, w io.Writer, r *http.Request, component templ.Component) {
+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)
 
 	slog.Debug("HX-Request", "value", r.Header.Get("HX-Request"))
 	if r.Header.Get("HX-Request") != "true" {
 		ctx = templ.WithChildren(ctx, component)
-		component = Base("hello")
+		component = Base(l.cfg, "Schreifuchs")
 	}
 
 	if err := component.Render(ctx, w); err != nil {

web/pages/index.templ

@@ -9,7 +9,7 @@ import (
 templ Home(pages []page.PageHeader) {
 	for _, page := range pages {
 		@components.ImageTile("/images/" + page.CoverImageUID) {
-			<a class="flex items-center justify-center h-full " href={ translate.Path(ctx, page.UID) } preload="mouseover">
+			<a class="flex items-center justify-center h-full " href={ translate.Path(ctx, "/"+page.UID) } preload="mouseover">
 				<h2
 					class="text-3xl font-bold text-white hover:underline text-shadow-lg"
 				>

web/pages/index_templ.go

@@ -1,92 +0,0 @@
-// Code generated by templ - DO NOT EDIT.
-
-// templ: version: v0.3.977
-package pages
-
-//lint:file-ignore SA4006 This context is only used if a nested component is present.
-
-import "github.com/a-h/templ"
-import templruntime "github.com/a-h/templ/runtime"
-
-import (
-	"git.schreifuchs.ch/schreifuchs/schreifuchs.ch/internal/components/page"
-	"git.schreifuchs.ch/schreifuchs/schreifuchs.ch/internal/components/translate"
-	"git.schreifuchs.ch/schreifuchs/schreifuchs.ch/web/components"
-)
-
-func Home(pages []page.PageHeader) templ.Component {
-	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
-		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
-		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
-			return templ_7745c5c3_CtxErr
-		}
-		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
-		if !templ_7745c5c3_IsBuffer {
-			defer func() {
-				templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
-				if templ_7745c5c3_Err == nil {
-					templ_7745c5c3_Err = templ_7745c5c3_BufErr
-				}
-			}()
-		}
-		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var1 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var1 == nil {
-			templ_7745c5c3_Var1 = templ.NopComponent
-		}
-		ctx = templ.ClearChildren(ctx)
-		for _, page := range pages {
-			templ_7745c5c3_Var2 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
-				templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
-				templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
-				if !templ_7745c5c3_IsBuffer {
-					defer func() {
-						templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
-						if templ_7745c5c3_Err == nil {
-							templ_7745c5c3_Err = templ_7745c5c3_BufErr
-						}
-					}()
-				}
-				ctx = templ.InitializeContext(ctx)
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 1, "<a class=\"flex items-center justify-center h-full \" href=\"")
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-				var templ_7745c5c3_Var3 templ.SafeURL
-				templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinURLErrs(translate.Path(ctx, page.UID))
-				if templ_7745c5c3_Err != nil {
-					return templ.Error{Err: templ_7745c5c3_Err, FileName: `pages/index.templ`, Line: 12, Col: 91}
-				}
-				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var3))
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 2, "\" preload=\"mouseover\"><h2 class=\"text-3xl font-bold text-white hover:underline text-shadow-lg\">")
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-				var templ_7745c5c3_Var4 string
-				templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(page.Title)
-				if templ_7745c5c3_Err != nil {
-					return templ.Error{Err: templ_7745c5c3_Err, FileName: `pages/index.templ`, Line: 16, Col: 17}
-				}
-				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var4))
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 3, "</h2></a>")
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-				return nil
-			})
-			templ_7745c5c3_Err = components.ImageTile("/images/"+page.CoverImageUID).Render(templ.WithChildren(ctx, templ_7745c5c3_Var2), templ_7745c5c3_Buffer)
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-		}
-		return nil
-	})
-}
-
-var _ = templruntime.GeneratedTemplate

web/pages/page_templ.go

@@ -1,86 +0,0 @@
-// Code generated by templ - DO NOT EDIT.
-
-// templ: version: v0.3.977
-package pages
-
-//lint:file-ignore SA4006 This context is only used if a nested component is present.
-
-import "github.com/a-h/templ"
-import templruntime "github.com/a-h/templ/runtime"
-
-import "git.schreifuchs.ch/schreifuchs/schreifuchs.ch/internal/components/page"
-import "git.schreifuchs.ch/schreifuchs/schreifuchs.ch/web/components"
-
-func ContentPage(content page.Page) templ.Component {
-	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
-		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
-		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
-			return templ_7745c5c3_CtxErr
-		}
-		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
-		if !templ_7745c5c3_IsBuffer {
-			defer func() {
-				templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
-				if templ_7745c5c3_Err == nil {
-					templ_7745c5c3_Err = templ_7745c5c3_BufErr
-				}
-			}()
-		}
-		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var1 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var1 == nil {
-			templ_7745c5c3_Var1 = templ.NopComponent
-		}
-		ctx = templ.ClearChildren(ctx)
-		templ_7745c5c3_Var2 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
-			templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
-			templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
-			if !templ_7745c5c3_IsBuffer {
-				defer func() {
-					templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
-					if templ_7745c5c3_Err == nil {
-						templ_7745c5c3_Err = templ_7745c5c3_BufErr
-					}
-				}()
-			}
-			ctx = templ.InitializeContext(ctx)
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 1, "<h2 class=\"flex items-center justify-center h-full text-3xl font-bold  text-shadow-lg\">")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			var templ_7745c5c3_Var3 string
-			templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs(content.Title)
-			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `pages/page.templ`, Line: 9, Col: 18}
-			}
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var3))
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 2, "</h2>")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			return nil
-		})
-		templ_7745c5c3_Err = components.ImageTile("/images/"+content.PageHeader.CoverImageUID).Render(templ.WithChildren(ctx, templ_7745c5c3_Var2), templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 3, "<div class=\"flex items-start justify-center pt-8 bg-black min-h-screen px-12\"><section class=\"max-w-6xl w-full prose prose-invert text-justify\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templ.Raw(content.Content).Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 4, "</section></div>")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		return nil
-	})
-}
-
-var _ = templruntime.GeneratedTemplate

web/static/js/preload.min.js

@@ -0,0 +1 @@
+(function(){htmx.defineExtension("preload",{onEvent:function(e,t){if(e==="htmx:afterProcessNode"){const n=t.target||t.detail.elt;const r=[...n.hasAttribute("preload")?[n]:[],...n.querySelectorAll("[preload]")];r.forEach(function(e){i(e);e.querySelectorAll("[href],[hx-get],[data-hx-get]").forEach(i)});return}if(e==="htmx:beforeRequest"){const o=t.detail.requestConfig.headers;if(!("HX-Preloaded"in o&&o["HX-Preloaded"]==="true")){return}t.preventDefault();const a=t.detail.xhr;a.onload=function(){s(t.detail.elt,a.responseText)};a.onerror=null;a.onabort=null;a.ontimeout=null;a.send()}}});function i(t){if(t.preloadState!==undefined){return}if(!l(t)){return}if(t instanceof HTMLFormElement){const o=t;if(!(o.hasAttribute("method")&&o.method==="get"||o.hasAttribute("hx-get")||o.hasAttribute("hx-data-get"))){return}for(let e=0;e<o.elements.length;e++){const a=o.elements.item(e);i(a);if("labels"in a){a.labels.forEach(i)}}return}let e=p(t,"preload");t.preloadAlways=e&&e.includes("always");if(t.preloadAlways){e=e.replace("always","").trim()}let n=e||"mousedown";const r=n==="mouseover";t.addEventListener(n,u(t,r),{passive:true});if(n==="mousedown"||n==="mouseover"){t.addEventListener("touchstart",u(t),{passive:true})}if(n==="mouseover"){t.addEventListener("mouseout",function(e){if(e.target===t&&t.preloadState==="TIMEOUT"){t.preloadState="READY"}},{passive:true})}t.preloadState="READY";htmx.trigger(t,"preload:init")}function u(t,n=false){return function(){if(t.preloadState!=="READY"){return}if(n){t.preloadState="TIMEOUT";const e=100;window.setTimeout(function(){if(t.preloadState==="TIMEOUT"){t.preloadState="READY";r(t)}},e);return}r(t)}}function r(n){if(n.preloadState!=="READY"){return}n.preloadState="LOADING";const e=n.getAttribute("hx-get")||n.getAttribute("data-hx-get");if(e){m(e,n);return}const t=p(n,"hx-boost")==="true";if(n.hasAttribute("href")){const r=n.getAttribute("href");if(t){m(r,n)}else{h(r,n)}return}if(g(n)){const r=n.form.getAttribute("action")||n.form.getAttribute("hx-get")||n.form.getAttribute("data-hx-get");const o=htmx.values(n.form);const a=!(n.form.getAttribute("hx-get")||n.form.getAttribute("data-hx-get")||t);const i=a?h:m;if(n.type==="submit"){i(r,n.form,o);return}const u=n.name||n.control.name;if(n.tagName==="SELECT"){Array.from(n.options).forEach(e=>{if(e.selected)return;o.set(u,e.value);const t=d(n.form,o);i(r,n.form,t)});return}const s=n.getAttribute("type")||n.control.getAttribute("type");const l=n.value||n.control?.value;if(s==="radio"){o.set(u,l)}else if(s==="checkbox"){const c=o.getAll(u);if(c.includes(l)){o[u]=c.filter(e=>e!==l)}else{o.append(u,l)}}const f=d(n.form,o);i(r,n.form,f);return}}function d(e,t){const n=e.elements;const r=new FormData;for(let e=0;e<n.length;e++){const o=n.item(e);if(t.has(o.name)&&o.tagName==="SELECT"){r.append(o.name,t.get(o.name));continue}if(t.has(o.name)&&t.getAll(o.name).includes(o.value)){r.append(o.name,o.value)}}return r}function m(e,t,n=undefined){htmx.ajax("GET",e,{source:t,values:n,headers:{"HX-Preloaded":"true"}})}function h(e,t,n=undefined){const r=new XMLHttpRequest;if(n){e+="?"+new URLSearchParams(n.entries()).toString()}r.open("GET",e);r.setRequestHeader("HX-Preloaded","true");r.onload=function(){s(t,r.responseText)};r.send()}function s(e,t){e.preloadState=e.preloadAlways?"READY":"DONE";if(p(e,"preload-images")==="true"){document.createElement("div").innerHTML=t}}function p(e,t){if(e==undefined){return undefined}return e.getAttribute(t)||e.getAttribute("data-"+t)||p(e.parentElement,t)}function l(e){const n=["href","hx-get","data-hx-get"];const t=t=>n.some(e=>t.hasAttribute(e))||t.method==="get";const r=e.form instanceof HTMLFormElement&&t(e.form)&&g(e);if(!t(e)&&!r){return false}if(e instanceof HTMLInputElement&&e.closest("label")){return false}return true}function g(e){if(e instanceof HTMLInputElement||e instanceof HTMLButtonElement){const t=e.getAttribute("type");return["checkbox","radio","submit"].includes(t)}if(e instanceof HTMLLabelElement){return e.control&&g(e.control)}return e instanceof HTMLSelectElement}})();